From ec76057b9bf2d668a0d09813cf88bd0cccebfcae Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Wed, 26 Oct 2005 19:47:48 +0000 Subject: [PATCH] Don't crash on duplicate destroy. (#318953, Gustavo Carneiro) 2005-10-26 Matthias Clasen * gtk/gtktreeview.c (gtk_tree_view_destroy): Don't crash on duplicate destroy. (#318953, Gustavo Carneiro) --- ChangeLog | 3 +++ ChangeLog.pre-2-10 | 3 +++ gtk/gtktreeview.c | 4 ++-- 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 63be8723ba..0d18698d02 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,8 @@ 2005-10-26 Matthias Clasen + * gtk/gtktreeview.c (gtk_tree_view_destroy): Don't crash + on duplicate destroy. (#318953, Gustavo Carneiro) + * gtk/gtkfilechooserbutton.c (gtk_file_chooser_button_new_with_dialog): Point out that destroy-with-parent is a bad idea for the dialog passed to this function. (#318943, Christian Persch) diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 63be8723ba..0d18698d02 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,5 +1,8 @@ 2005-10-26 Matthias Clasen + * gtk/gtktreeview.c (gtk_tree_view_destroy): Don't crash + on duplicate destroy. (#318953, Gustavo Carneiro) + * gtk/gtkfilechooserbutton.c (gtk_file_chooser_button_new_with_dialog): Point out that destroy-with-parent is a bad idea for the dialog passed to this function. (#318943, Christian Persch) diff --git a/gtk/gtktreeview.c b/gtk/gtktreeview.c index 50cf27924d..b4460d9452 100644 --- a/gtk/gtktreeview.c +++ b/gtk/gtktreeview.c @@ -1408,13 +1408,13 @@ gtk_tree_view_destroy (GtkObject *object) } } - if (tree_view->priv->search_destroy) + if (tree_view->priv->search_destroy && tree_view->priv->search_user_data) { (* tree_view->priv->search_destroy) (tree_view->priv->search_user_data); tree_view->priv->search_user_data = NULL; } - if (tree_view->priv->row_separator_destroy) + if (tree_view->priv->row_separator_destroy && tree_view->priv->row_separator_data) { (* tree_view->priv->row_separator_destroy) (tree_view->priv->row_separator_data); tree_view->priv->row_separator_data = NULL; -- 2.30.2